From 026b5014e89b7637d0f9cb4e15858ca86e41925c Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Mon, 24 Mar 2014 13:19:53 +0100 Subject: [PATCH] Add: GTK_PHASE_NONE value to GtkCapturePhase. Gestures attached with this phase will expect callers to have it receive events through gtk_event_controller_handle_event(), but the gesture will still be notified of sequence state changes, grabs, etc... --- gtk/gtkenums.h | 1 + gtk/gtkwidget.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index 3bc1716b56..1653746912 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -1051,6 +1051,7 @@ typedef enum typedef enum { + GTK_PHASE_NONE, GTK_PHASE_CAPTURE, GTK_PHASE_BUBBLE } GtkPropagationPhase; diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index fe68ebeeb5..a2b1522625 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -16549,8 +16549,8 @@ gtk_widget_add_controller (GtkWidget *widget, g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller)); - g_return_if_fail (phase == GTK_PHASE_CAPTURE || - phase == GTK_PHASE_BUBBLE); + g_return_if_fail (phase >= GTK_PHASE_NONE && + phase <= GTK_PHASE_BUBBLE); priv = widget->priv; @@ -16613,8 +16613,8 @@ gtk_widget_list_controllers (GtkWidget *widget, GList *l, *retval = NULL; g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - g_return_val_if_fail (phase == GTK_PHASE_CAPTURE || - phase == GTK_PHASE_BUBBLE, NULL); + g_return_val_if_fail (phase >= GTK_PHASE_NONE && + phase <= GTK_PHASE_BUBBLE, NULL); priv = widget->priv; -- 2.30.2